* gtkutil.c (xg_initialize): Backport from trunk.

Add ifdef HAVE_FREETYPE around x_last_font_name.

Fixes: debbugs:13403

diff --git a/src/ChangeLog b/src/ChangeLog
index 0ba5b2ccab27f1cd28161bdf4a13bc11e979860a..8c16df2803d9ea4cdfa4dfbedd8944d94d79fb9c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * gtkutil.c (xg_initialize): Backport from trunk.
+       Add ifdef HAVE_FREETYPE around x_last_font_name (Bug#13403).
+
 2013-01-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        Backport typo fix from trunk, for AIX (Bug#13408).

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 0c7d0d18f0b5036b3ea15c8c4eaabf562edb38ff..e76b0a733a0bc1b4d8b98ac7d9c1210c7256d1a4 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4994,7 +4994,9 @@ xg_initialize (void)
                                 "cancel", 0);
   update_theme_scrollbar_width ();
 
+#ifdef HAVE_FREETYPE
   x_last_font_name = NULL;
+#endif
 }
 
 #endif /* USE_GTK */